projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e5db99
)
Fix previous manual mis-merge of dired-aux
author
Lars Ingebrigtsen
<larsi@gnus.org>
Fri, 4 Sep 2020 13:50:48 +0000
(15:50 +0200)
committer
Lars Ingebrigtsen
<larsi@gnus.org>
Fri, 4 Sep 2020 13:50:48 +0000
(15:50 +0200)
* lisp/dired-aux.el (dired-rename-file): Fix manual mis-merge of
previous patch.
lisp/dired-aux.el
patch
|
blob
|
history
diff --git
a/lisp/dired-aux.el
b/lisp/dired-aux.el
index eeb06beafd38ee972f1835fa111f6d02bdfc570b..82f4455392e630b7e2684a3b33d2b3a53a82fa0f 100644
(file)
--- a/
lisp/dired-aux.el
+++ b/
lisp/dired-aux.el
@@
-1689,7
+1689,8
@@
unless OK-IF-ALREADY-EXISTS is non-nil."
(set-visited-file-name newname nil t)))
(dired-remove-file file)
;; See if it's an inserted subdir, and rename that, too.
- (dired-rename-subdir file newname))
+ (when (file-directory-p file)
+ (dired-rename-subdir file newname)))
(defun dired-rename-subdir (from-dir to-dir)
(setq from-dir (file-name-as-directory from-dir)